Replace all margin-left and margin-right with margin-start and margin-end

https://bugzilla.gnome.org/show_bug.cgi?id=710238

diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui
index 1d426014d30f477e749b39a1a1bdf9baec80fc29..b9423f2366c83999f322f7cdd4441d3d90cb44ee 100644 (file)
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -38,8 +38,8 @@
             <property name="valign">start</property>
             <property name="margin_top">8</property>
             <property name="margin_bottom">8</property>
-            <property name="margin_left">8</property>
-            <property name="margin_right">8</property>
+            <property name="margin_start">8</property>
+            <property name="margin_end">8</property>
             <property name="icon-name">image-missing</property>
           </object>
           <packing>

diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c
index b291ac1fafe5b3c08558440cddf473587fcdeb75..60f419f67f53a3eae02bad098575335cd132e30d 100644 (file)
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -51,8 +51,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_END);
       gtk_widget_set_valign (label, GTK_ALIGN_END);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 20);
-      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 
@@ -65,8 +65,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_END);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 20);
-      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 
@@ -79,8 +79,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_END);
       gtk_widget_set_valign (label, GTK_ALIGN_START);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 20);
-      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 
@@ -93,8 +93,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_START);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 20);
-      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 
@@ -107,8 +107,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_END);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 20);
-      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 
@@ -121,8 +121,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 20);
-      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 
@@ -135,8 +135,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (label, GTK_ALIGN_START);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 20);
-      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 
@@ -149,8 +149,8 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (label, GTK_ALIGN_END);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
-      gtk_widget_set_margin_left (label, 10);
-      gtk_widget_set_margin_right (label, 10);
+      gtk_widget_set_margin_start (label, 10);
+      gtk_widget_set_margin_end (label, 10);
       gtk_widget_set_margin_top (label, 5);
       gtk_widget_set_margin_bottom (label, 5);
 

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 8512505839b337d90948e1bdd79894b448d0f21f..b043d6bf4e2bc7e3f7277081321fbe2a6ef7187b 100644 (file)
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1756,8 +1756,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                             <property name="visible">True</property>
                             <property name="margin-top">10</property>
                             <property name="margin-bottom">10</property>
-                            <property name="margin-left">10</property>
-                            <property name="margin-right">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
                             <property name="spacing">20</property>
                             <child>
                               <object class="GtkLabel" id="page2note">

diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c
index 9191bc374bf8b7f27750c4f2a8ab2401fe6d08c7..774d0d18da4fe42926d79104dcacc425ca185bcc 100644 (file)
--- a/gtk/deprecated/gtktable.c
+++ b/gtk/deprecated/gtktable.c
@@ -897,8 +897,8 @@ gtk_table_get_row_spacing (GtkTable *table,
  * Alters the amount of space between a given table column and the following
  * column.
  *
- * Deprecated: 3.4: Use gtk_widget_set_margin_left() and
- *     gtk_widget_set_margin_right() on the widgets contained in the row if
+ * Deprecated: 3.4: Use gtk_widget_set_margin_start() and
+ *     gtk_widget_set_margin_end() on the widgets contained in the row if
  *     you need this functionality. #GtkGrid does not support per-row spacing.
  */
 void

diff --git a/gtk/gtkcoloreditor.ui b/gtk/gtkcoloreditor.ui
index bfd3e1a7d524d8bce1a131ecd64abb5cb8a3c83d..3f4a9fc13fb3ab775c8c7c5ad323c8b992586879 100644 (file)
--- a/gtk/gtkcoloreditor.ui
+++ b/gtk/gtkcoloreditor.ui
@@ -38,8 +38,8 @@
           <object class="GtkGrid" id="grid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">30</property>
-            <property name="margin_right">30</property>
+            <property name="margin_start">30</property>
+            <property name="margin_end">30</property>
             <property name="row_spacing">12</property>
             <property name="column_spacing">12</property>
             <child>
@@ -157,8 +157,8 @@
       <object class="GtkGrid" id="grid4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="margin_right">12</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
         <property name="margin_top">12</property>
         <property name="margin_bottom">12</property>
         <property name="column_spacing">6</property>
@@ -215,8 +215,8 @@
       <object class="GtkGrid" id="grid3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="margin_right">12</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
         <property name="margin_top">12</property>
         <property name="margin_bottom">12</property>
         <property name="column_spacing">6</property>
@@ -273,8 +273,8 @@
       <object class="GtkGrid" id="grid2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="margin_right">12</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
         <property name="margin_top">12</property>
         <property name="margin_bottom">12</property>
         <property name="row_spacing">6</property>

diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 713bb7e0bc884e3c1da8aa175fb0c2acd067d109..6898f6f986df4873f7e899ddc2f9a32fdecae344 100644 (file)
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -963,7 +963,7 @@ wrap_in_frame (const gchar *label,
   frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
 
-  gtk_widget_set_margin_left (child, 12);
+  gtk_widget_set_margin_start (child, 12);
   gtk_widget_set_halign (child, GTK_ALIGN_FILL);
   gtk_widget_set_valign (child, GTK_ALIGN_FILL);
 

diff --git a/gtk/gtkfontchooserwidget.ui b/gtk/gtkfontchooserwidget.ui
index dd6a12e21f99d6eba38901ffd774d6c83e0cbf77..c12bdab604479433d9558be048d704083193bc95 100644 (file)
--- a/gtk/gtkfontchooserwidget.ui
+++ b/gtk/gtkfontchooserwidget.ui
@@ -113,8 +113,8 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">start</property>
-                <property name="margin_left">12</property>
-                <property name="margin_right">12</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
                 <property name="margin_top">12</property>
                 <property name="margin_bottom">12</property>
                 <property name="label" translatable="yes">No fonts matched your search. You can revise your search and try again.</property>

diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 59a8fa73b898b4cb8030d8645c63dffbf0aff29c..3fae8a187dfa82a2a4028071cf45be630a7d5d2e 100644 (file)
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -104,8 +104,8 @@ gtk_overlay_compute_child_allocation (GtkOverlay      *overlay,
   /* put the margins outside the window; also arrange things
    * so that the adjusted child allocation still ends up at 0, 0
    */
-  left = gtk_widget_get_margin_left (child->widget);
-  right = gtk_widget_get_margin_right (child->widget);
+  left = gtk_widget_get_margin_start (child->widget);
+  right = gtk_widget_get_margin_end (child->widget);
   top = gtk_widget_get_margin_top (child->widget);
   bottom = gtk_widget_get_margin_bottom (child->widget);
 

diff --git a/gtk/gtkprintunixdialog.ui b/gtk/gtkprintunixdialog.ui
index c4c6513e196c49bea25b75846071709db107ea6c..0a0530ab96425768c03a755269365514d8c6c5fc 100644 (file)
--- a/gtk/gtkprintunixdialog.ui
+++ b/gtk/gtkprintunixdialog.ui
@@ -268,7 +268,7 @@
                               <object class="GtkGrid" id="range_table">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">12</property>
+                                <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
@@ -415,7 +415,7 @@
                               <object class="GtkGrid" id="grid1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">12</property>
+                                <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
@@ -575,7 +575,7 @@
                               <object class="GtkGrid" id="grid2">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">12</property>
+                                <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
@@ -811,7 +811,7 @@
                               <object class="GtkGrid" id="grid3">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_left">12</property>
+                                <property name="margin_start">12</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
                                 <child>
@@ -1080,7 +1080,7 @@
                           <object class="GtkGrid" id="grid5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin_start">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>
@@ -1189,7 +1189,7 @@
                           <object class="GtkGrid" id="grid6">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin_start">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>
@@ -1328,7 +1328,7 @@
                           <object class="GtkGrid" id="grid7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
+                            <property name="margin_start">12</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
                             <child>

diff --git a/gtk/gtkstatusbar.ui b/gtk/gtkstatusbar.ui
index 94c7f67fd98336bebc833d6dcd78d4aa955f45c8..c506b9b1ce92e1975b2f4d811b01eb6d88b47f73 100644 (file)
--- a/gtk/gtkstatusbar.ui
+++ b/gtk/gtkstatusbar.ui
@@ -5,8 +5,8 @@
     <property name="can_focus">False</property>
     <property name="vexpand">False</property>
     <property name="spacing">2</property>
-    <property name="margin_left">10</property>
-    <property name="margin_right">10</property>
+    <property name="margin_start">10</property>
+    <property name="margin_end">10</property>
     <property name="margin_top">6</property>
     <property name="margin_bottom">6</property>
     <child>

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 3363bb389b2303c30966691b7d1e952ceec07a54..1168a836f5cd7f353d97d9eee31f474b26ca1260 100644 (file)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -1469,8 +1469,8 @@ gtk_status_icon_padding_changed (GtkStatusIcon *status_icon)
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
-      gtk_widget_set_margin_left (priv->image, padding);
-      gtk_widget_set_margin_right (priv->image, padding);
+      gtk_widget_set_margin_start (priv->image, padding);
+      gtk_widget_set_margin_end (priv->image, padding);
     }
   else
     {

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 9f35f42c82f6dd18f480b1db1e963cf6d4fcf3d2..d883c9fe9a9d90add220985ba8f95f34b9f93a61 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -3634,23 +3634,26 @@ gtk_style_context_get_margin (GtkStyleContext *context,
                               GtkStateFlags    state,
                               GtkBorder       *margin)
 {
-  int top, left, bottom, right;
+  int top, start, bottom, end;
+  gboolean rtl;
 
   g_return_if_fail (margin != NULL);
   g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
 
+  rtl = (gtk_style_context_get_state (context) & GTK_STATE_FLAG_DIR_RTL);
+
   gtk_style_context_get (context,
                          state,
                          "margin-top", &top,
-                         "margin-left", &left,
+                         "margin-start", &start,
                          "margin-bottom", &bottom,
-                         "margin-right", &right,
+                         "margin-end", &end,
                          NULL);
 
   margin->top = top;
-  margin->left = left;
+  margin->left = rtl ? start : end;
   margin->bottom = bottom;
-  margin->right = right;
+  margin->right = rtl ? end : start;
 }
 
 /**

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 7d8a6c5b82ba3c770bb570d93fe47b605ee3ea11..71b99646c4a29a99c0dec3649405316775379bf0 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -240,8 +240,8 @@ gtk_tooltip_init (GtkTooltip *tooltip)
 
   /* FIXME: don't hardcode the padding */
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_widget_set_margin_left (box, 6);
-  gtk_widget_set_margin_right (box, 6);
+  gtk_widget_set_margin_start (box, 6);
+  gtk_widget_set_margin_end (box, 6);
   gtk_widget_set_margin_top (box, 6);
   gtk_widget_set_margin_bottom (box, 6);
   gtk_container_add (GTK_CONTAINER (window), box);

diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index d3dccda72c9cd28d2d957b86c8dbc9c52c9b0f4e..8b724410ad8dee4f0160a11d86b681db57f364ad 100644 (file)
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -354,8 +354,8 @@ open_margin_window (void)
   GtkWidget *box;
   int i;
   const char * margins[] = {
-    "margin-left",
-    "margin-right",
+    "margin-start",
+    "margin-end",
     "margin-top",
     "margin-bottom",
     "margin"

diff --git a/tests/testgtk.c b/tests/testgtk.c
index ddc2ca0ab2dadda5248b9f94cae419262fd270ee..11fcf1726ab8dae1de419b76be21615561cf7456 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -6020,8 +6020,8 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid);
                           
       gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE, 0);
-      gtk_widget_set_margin_left (pixwid, 3);
-      gtk_widget_set_margin_right (pixwid, 3);
+      gtk_widget_set_margin_start (pixwid, 3);
+      gtk_widget_set_margin_end (pixwid, 3);
       gtk_widget_set_margin_bottom (pixwid, 1);
       gtk_widget_set_margin_top (pixwid, 1);
       label = gtk_label_new_with_mnemonic (accel_buffer);
@@ -6034,8 +6034,8 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid);
       
       gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE, 0);
-      gtk_widget_set_margin_left (pixwid, 3);
-      gtk_widget_set_margin_right (pixwid, 3);
+      gtk_widget_set_margin_start (pixwid, 3);
+      gtk_widget_set_margin_end (pixwid, 3);
       gtk_widget_set_margin_bottom (pixwid, 1);
       gtk_widget_set_margin_top (pixwid, 1);
       label = gtk_label_new (buffer);

diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 911050e986f40a899be4943a564dd7eef6d3449f..161fd6c235b6be9b18efa195f7a6c1108093269c 100644 (file)
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
   str = g_strdup_printf ("%p", child);
   gtk_label_set_text (GTK_LABEL (child), str);
   g_free (str);
-  gtk_widget_set_margin_left (child, 55);
+  gtk_widget_set_margin_start (child, 55);
   gtk_widget_set_margin_top (child, 4);
   g_print ("Left/Top margined child: %p\n", child);
   gtk_widget_set_halign (child, GTK_ALIGN_START);

diff --git a/tests/testrevealer.c b/tests/testrevealer.c
index 3eab9cd0f3a9801dcbff37729b72a3a6d347295b..2de4c576b901a6f217905860869e2545a300ea2b 100644 (file)
--- a/tests/testrevealer.c
+++ b/tests/testrevealer.c
@@ -17,15 +17,15 @@ main (gint argc,
   widget = gtk_label_new ("Some filler text to avoid\nresizing of the window");
   gtk_widget_set_margin_top (widget, 10);
   gtk_widget_set_margin_bottom (widget, 10);
-  gtk_widget_set_margin_left (widget, 10);
-  gtk_widget_set_margin_right (widget, 10);
+  gtk_widget_set_margin_start (widget, 10);
+  gtk_widget_set_margin_end (widget, 10);
   gtk_grid_attach (GTK_GRID (box), widget, 1, 1, 1, 1);
 
   widget = gtk_label_new ("Some filler text to avoid\nresizing of the window");
   gtk_widget_set_margin_top (widget, 10);
   gtk_widget_set_margin_bottom (widget, 10);
-  gtk_widget_set_margin_left (widget, 10);
-  gtk_widget_set_margin_right (widget, 10);
+  gtk_widget_set_margin_start (widget, 10);
+  gtk_widget_set_margin_end (widget, 10);
   gtk_grid_attach (GTK_GRID (box), widget, 3, 3, 1, 1);
 
   widget = gtk_toggle_button_new_with_label ("None");

diff --git a/tests/visuals/osd-toolbars.ui b/tests/visuals/osd-toolbars.ui
index ec4d8ea0449e93a2d47474430f087898b6eb78be..3ac7df61597f254b2ee2285a9668aba2a5e10b83 100644 (file)
--- a/tests/visuals/osd-toolbars.ui
+++ b/tests/visuals/osd-toolbars.ui
@@ -104,8 +104,8 @@
                   <object class="GtkLabel" id="status_label">
                     <property name="visible">True</property>
                     <property name="label">OSD Toolbar</property>
-                    <property name="margin_left">10</property>
-                    <property name="margin_right">10</property>
+                    <property name="margin_start">10</property>
+                    <property name="margin_end">10</property>
                   </object>
                 </child>
               </object>
@@ -204,8 +204,8 @@
                   <object class="GtkLabel" id="tb5_label">
                     <property name="visible">True</property>
                     <property name="label">Another kind of OSD toolbar</property>
-                    <property name="margin_left">10</property>
-                    <property name="margin_right">10</property>
+                    <property name="margin_start">10</property>
+                    <property name="margin_end">10</property>
                   </object>
                 </child>
               </object>

diff --git a/testsuite/reftests/alignment-props.ui b/testsuite/reftests/alignment-props.ui
index 40415a3661757db87cc0e416e89f222d552f1a0b..08acf684b996c2ffaf8485f03188f77e0c942887 100644 (file)
--- a/testsuite/reftests/alignment-props.ui
+++ b/testsuite/reftests/alignment-props.ui
@@ -79,8 +79,8 @@
             <property name="vexpand">True</property>
             <property name="margin-top">10</property>
             <property name="margin-bottom">30</property>
-            <property name="margin-left">20</property>
-            <property name="margin-right">40</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">40</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -100,8 +100,8 @@
             <property name="vexpand">True</property>
             <property name="margin-top">10</property>
             <property name="margin-bottom">30</property>
-            <property name="margin-left">20</property>
-            <property name="margin-right">40</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">40</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -121,8 +121,8 @@
             <property name="vexpand">True</property>
             <property name="margin-top">10</property>
             <property name="margin-bottom">30</property>
-            <property name="margin-left">20</property>
-            <property name="margin-right">40</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">40</property>
           </object>
           <packing>
             <property name="left_attach">2</property>

diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui
index 9c6a93b71d212cb5828ff0803118e83ac50a1701..d954396e7820d4295650712d303d3ef4275656f2 100644 (file)
--- a/testsuite/reftests/inherit-and-initial.ref.ui
+++ b/testsuite/reftests/inherit-and-initial.ref.ui
@@ -1771,8 +1771,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
             <property name="name">inherit</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
+            <property name="margin_start">5</property>
+            <property name="margin_end">5</property>
             <property name="margin_bottom">5</property>
             <property name="spacing">10</property>
             <property name="homogeneous">True</property>

diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui
index 7b9dc0ae49baa6b27fbfe4f300b2e5e53bbfcd3a..be81c8f60a2be7ee3927d563b94ec037949fc9c4 100644 (file)
--- a/testsuite/reftests/inherit-and-initial.ui
+++ b/testsuite/reftests/inherit-and-initial.ui
@@ -1643,8 +1643,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
           <object class="GtkBox" id="box5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
+            <property name="margin_start">5</property>
+            <property name="margin_end">5</property>
             <property name="margin_bottom">5</property>
             <property name="spacing">10</property>
             <property name="homogeneous">True</property>

diff --git a/testsuite/reftests/misc-alignment.ui b/testsuite/reftests/misc-alignment.ui
index a6e2b63f1e0f870bef0dc2c5b3abf212fc63fd94..622b8508b01932ca791041bc035d07e76238d729 100644 (file)
--- a/testsuite/reftests/misc-alignment.ui
+++ b/testsuite/reftests/misc-alignment.ui
@@ -30,8 +30,8 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_start">10</property>
+            <property name="margin_end">10</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">10</property>
             <property name="halign">start</property>
@@ -51,8 +51,8 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">20</property>
-            <property name="margin_right">20</property>
+            <property name="margin_start">20</property>
+            <property name="margin_end">20</property>
             <property name="margin_top">20</property>
             <property name="margin_bottom">20</property>
             <property name="halign">center</property>
@@ -72,8 +72,8 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_start">10</property>
+            <property name="margin_end">10</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">10</property>
             <property name="halign">end</property>
@@ -126,8 +126,8 @@
           <object class="GtkArrow" id="arrow2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_start">10</property>
+            <property name="margin_end">10</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">10</property>
             <property name="halign">start</property>
@@ -147,8 +147,8 @@
             <property name="width_request">16</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">20</property>
-            <property name="margin_right">20</property>
+            <property name="margin_start">20</property>
+            <property name="margin_end">20</property>
             <property name="margin_top">20</property>
             <property name="margin_bottom">20</property>
             <property name="halign">center</property>
@@ -167,8 +167,8 @@
           <object class="GtkArrow" id="arrow4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_start">10</property>
+            <property name="margin_end">10</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">10</property>
             <property name="halign">end</property>
@@ -224,8 +224,8 @@
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_start">10</property>
+            <property name="margin_end">10</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">10</property>
             <property name="hexpand">True</property>
@@ -245,8 +245,8 @@
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="margin_left">20</property>
-            <property name="margin_right">20</property>
+            <property name="margin_start">20</property>
+            <property name="margin_end">20</property>
             <property name="margin_top">20</property>
             <property name="margin_bottom">20</property>
             <property name="hexpand">True</property>
@@ -266,8 +266,8 @@
             <property name="can_focus">False</property>
             <property name="halign">end</property>
             <property name="valign">end</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
+            <property name="margin_start">10</property>
+            <property name="margin_end">10</property>
             <property name="margin_top">10</property>
             <property name="margin_bottom">10</property>
             <property name="hexpand">True</property>

diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
index dde8748cc5427ce2a32c2a8eabe7b8fd3c7b3057..f2bbe6b7b4f1cd1c6d1f84168189b876df1ae285 100644 (file)
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
@@ -44,7 +44,7 @@
           <object class="GtkLabel" id="label3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
 For example, "Work" or "Personal".</property>
@@ -60,7 +60,7 @@ For example, "Work" or "Personal".</property>
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">_Name:</property>
             <property name="use_underline">True</property>
@@ -106,7 +106,7 @@ For example, "Work" or "Personal".</property>
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Full Nam_e:</property>
             <property name="use_underline">True</property>
@@ -137,7 +137,7 @@ For example, "Work" or "Personal".</property>
           <object class="GtkLabel" id="label7">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
             <property name="label" translatable="yes">Email _Address:</property>
             <property name="use_underline">True</property>
           </object>
@@ -181,7 +181,7 @@ For example, "Work" or "Personal".</property>
           <object class="GtkLabel" id="label9">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Re_ply-To:</property>
             <property name="use_underline">True</property>
@@ -212,7 +212,7 @@ For example, "Work" or "Personal".</property>
           <object class="GtkLabel" id="label10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">12</property>
+            <property name="margin_start">12</property>
             <property name="xalign">1</property>
             <property name="label" translatable="yes">Or_ganization:</property>
             <property name="use_underline">True</property>

diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui b/testsuite/reftests/sizegroups-evolution-identity-page.ui
index f213d57e4893074903f61746b5c22c2a7ad15c9e..42724d3be54527735f70eeacfae71eb27bcf61da 100644 (file)
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui
@@ -49,7 +49,7 @@
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin_start">12</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
 For example, "Work" or "Personal".</property>
@@ -65,7 +65,7 @@ For example, "Work" or "Personal".</property>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">_Name:</property>
                 <property name="use_underline">True</property>
@@ -124,7 +124,7 @@ For example, "Work" or "Personal".</property>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Full Nam_e:</property>
                 <property name="use_underline">True</property>
@@ -155,7 +155,7 @@ For example, "Work" or "Personal".</property>
               <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Email _Address:</property>
                 <property name="use_underline">True</property>
               </object>
@@ -212,7 +212,7 @@ For example, "Work" or "Personal".</property>
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Re_ply-To:</property>
                 <property name="use_underline">True</property>
@@ -243,7 +243,7 @@ For example, "Work" or "Personal".</property>
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">12</property>
+                <property name="margin_start">12</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Or_ganization:</property>
                 <property name="use_underline">True</property>